From f0cc0507569f1b0e0ee004ed48600f832a9fa97d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20M=C3=BCllner?= Date: Tue, 27 May 2025 14:50:20 +0200 Subject: [PATCH] tools/toolbox: Use devkit when integrating with GNOME Builder Also support the new devkit when running from Builder. Unlike for the run-gnome-shell script, we cannot easily support both --devkit and --nested (without adding some wrapper), so drop the latter. It should be fairly uncommon to use Builder to develop against older branches, so hopefully this shouldn't be a limitation in practice. Part-of: --- tools/toolbox/create-toolbox.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/toolbox/create-toolbox.sh b/tools/toolbox/create-toolbox.sh index c5bad3505..bb3b86224 100755 --- a/tools/toolbox/create-toolbox.sh +++ b/tools/toolbox/create-toolbox.sh @@ -53,7 +53,6 @@ install_extra_packages() { create_builder_config() { local container_id=$(podman container inspect --format='{{.Id}}' $NAME) local top_srcdir=$(realpath $(dirname $0)/../..) - local wayland_display=builder-wayland-0 cat >> $top_srcdir/.buildconfig <<-EOF @@ -61,10 +60,9 @@ create_builder_config() { name=$NAME Toolbox runtime=podman:$container_id prefix=/usr - run-command=dbus-run-session gnome-shell --nested --wayland-display=$wayland_display + run-command=dbus-run-session gnome-shell --devkit [toolbox-$NAME.runtime_environment] - WAYLAND_DISPLAY=$wayland_display G_MESSAGES_DEBUG=GNOME Shell XDG_DATA_DIRS=${XDG_DATA_DIRS:-/usr/local/share:/usr/share} EOF -- 2.39.5